merge?
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 13 Sep 2005 15:05:49 +0000 (15:05 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 13 Sep 2005 15:05:49 +0000 (15:05 +0000)
1  2 
.hgignore
tools/python/xen/xend/XendDomainInfo.py
tools/xenstore/xenstore_client.c

diff --cc .hgignore
Simple merge
Simple merge